Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 23 Jul 2011 16:12:03 +0000 (09:12 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 23 Jul 2011 16:12:03 +0000 (09:12 -0700)
commit7da17bab91730a85a6ab1abbe36b82c9b549d502
tree386f3f6485b903f627367880afb26eda90533858
parente3b2c16d7f71f41dea8a652cd6b1b0bb0732ce2f
parentac2df778e1d783b6b2b5376ff21182b9dd6a8c08
Merge from trunk.